bitkeeper revision 1.1376 (426a6160VtACVFwzChimSdGZNrpWGg)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 23 Apr 2005 14:53:20 +0000 (14:53 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 23 Apr 2005 14:53:20 +0000 (14:53 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge